Merge branch 'next'
authorGerald Van Baren <[email protected]>
Tue, 23 Oct 2012 00:42:09 +0000 (20:42 -0400)
committerGerald Van Baren <[email protected]>
Tue, 23 Oct 2012 00:42:09 +0000 (20:42 -0400)

Trivial merge